Repository navigation
fix(color): wait for power button release before splash power check - #8000
Merged
Merged
Conversation
Since #7618 the color splash wait actually runs on H7 radios, and it calls pwrCheck() via blockUntilClose(). If the power button used to turn the radio on is still held, the shutdown countdown starts (or, with both buttons held on PWR_EXTRA_SWITCH radios, the radio turns straight off). The release wait added in #7618 was limited to PWR_BUTTON_DUAL radios; apply it to all PWR_BUTTON_PRESS radios, keeping killAllEvents() for the dual-button ones only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pfeerick
added
color
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When powering on, if the power button is still held as the splash screen appears, the shutdown countdown starts straight away instead of waiting for the button to be released. On radios with two power buttons that aren't
PWR_BUTTON_DUAL(e.g. T18 H7, PA01), still holding both buttons makes the shutdown delay zero, so the radio turns straight back off. Noticed it myself during testing PRs a couple days ago and was also reported on Discord.Cause
waitSplash()to useMainWindow::blockUntilClose(true, …), which callspwrCheck()on every loop.splashStartTimewas still 0. fix(color): splash screen delay time is bypassed on H7 radios #7618 fixed that, so the wait now runs, and with itpwrCheck(), while the button may still be held from power-on.PWR_BUTTON_DUALradios (V12, V15).Fix
Apply the release wait to all
PWR_BUTTON_PRESSradios.killAllEvents()stays limited toPWR_BUTTON_DUALradios, where the power buttons double as SYS/MDL keys. Shutdown behaviour after boot is unchanged.2.12 is not affected: its splash loop doesn't call
pwrCheck()on hardware.Testing
Tested on hardware: T18 H7, PA01, TX16S and V15.
🤖 Generated with Claude Code